Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implementation of hybrid generator #13699

Open
wants to merge 19 commits into
base: dev
Choose a base branch
from
Open

Implementation of hybrid generator #13699

wants to merge 19 commits into from
+211,197 −18

Conversation

jackal1-66
Copy link
Collaborator

The new GeneratorHybrid class allows users to run all the implemented generators in series using them as subgenerators. The configuration happens thanks to a JSON file whose template can be generated thanks to the script pushed in this PR https://github.com/AliceO2Group/O2DPG/pull/1802/files

@jackal1-66
Pulled from first hybrid generator implementation
6d482bb
@jackal1-66
Reset hybrid gen implementation
4cdde00
@jackal1-66
First working version with External generator
8997c84
@jackal1-66
Included HepMC basic functionality in Hybrid Gen
6d512bb
@jackal1-66
Lowercase to hybrid generator parameters
6ce5b8e
@jackal1-66
First working implementation of json configuration file in hybrid gen…
1ae6842 
…erator
@jackal1-66
Introduced TBufferJSON functions + local params for Pythia8, BoxGen a…
74db66f 
…nd O2Kine

Pythia8 and BoxGen work well, but O2Kine has an issue since it returns "GeneratorFromO2Kine: Ran out of events" when running. This is ONLY the first implementation, multiple tests and fixes must still be implemented, apart from adding the other generators.
@jackal1-66
Fixed trivial mistake on parametric extKinO2 generator: now working.
b2d67c7
@jackal1-66
Finished implementation for remaining geneators
37feb1c 
They are all working now, a cleanup of the code will be done in next commits. The cmd spawning feature is now working also with the hybrid configuration
@github-actions GitHub Actions
Copy link
Contributor

REQUEST FOR PRODUCTION RELEASES:
To request your PR to be included in production software, please add the corresponding labels called "async-" to your PR. Add the labels directly (if you have the permissions) or add a comment of the form (note that labels are separated by a ",")

+async-label <label1>, <label2>, !<label3> ...

This will add <label1> and <label2> and removes <label3>.

The following labels are available
async-2023-pbpb-apass4
async-2023-pp-apass4
async-2024-pp-apass1
async-2022-pp-apass7
async-2024-pp-cpass0
async-2024-PbPb-cpass0
async-2024-PbPb-apass1
async-2024-ppRef-apass1

@alibuild alibuild mentioned this pull request Nov 15, 2024
Merged
@jackal1-66 jackal1-66 mentioned this pull request Nov 15, 2024
Open
@alibuild
Copy link
Collaborator

Error while checking build/O2/fullCI for 37feb1c at 2024-11-15 19:21:

## sw/BUILD/O2-latest/log
c++: error: unrecognized command-line option '--rtlib=compiler-rt'
c++: error: unrecognized command-line option '--rtlib=compiler-rt'


## sw/BUILD/o2checkcode-latest/log
--
========== List of errors found ==========
++ GRERR=0
++ grep -v clang-diagnostic-error error-log.txt
++ grep ' error:'
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:584:19: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:586:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:602:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:604:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:635:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:637:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:143:49: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:149:44: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:151:11: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:256:15: error: statement should be inside braces [readability-braces-around-statements]
++ [[ 0 == 0 ]]
++ exit 1
--

Full log here.

@alibuild
Copy link
Collaborator

Error while checking build/O2/fullCI for 94b4413 at 2024-11-15 20:17:

## sw/BUILD/O2-latest/log
c++: error: unrecognized command-line option '--rtlib=compiler-rt'
c++: error: unrecognized command-line option '--rtlib=compiler-rt'


## sw/BUILD/o2checkcode-latest/log
--
========== List of errors found ==========
++ GRERR=0
++ grep -v clang-diagnostic-error error-log.txt
++ grep ' error:'
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:584:19: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:586:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:602:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:604:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:635:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:637:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:143:49: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:149:44: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:151:11: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:256:15: error: statement should be inside braces [readability-braces-around-statements]
++ [[ 0 == 0 ]]
++ exit 1
--

Full log here.

@alibuild
Copy link
Collaborator

Error while checking build/O2/fullCI for b1c2d37 at 2024-11-17 04:51:

## sw/BUILD/O2-latest/log
c++: error: unrecognized command-line option '--rtlib=compiler-rt'
c++: error: unrecognized command-line option '--rtlib=compiler-rt'


## sw/BUILD/o2checkcode-latest/log
--
========== List of errors found ==========
++ GRERR=0
++ grep -v clang-diagnostic-error error-log.txt
++ grep ' error:'
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:583:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:585:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:601:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:603:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:634:20: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorPythia8.cxx:636:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:140:45: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:146:41: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:148:7: error: statement should be inside braces [readability-braces-around-statements]
/sw/SOURCES/O2/13699-slc8_x86-64/0/Generators/src/GeneratorHybrid.cxx:249:15: error: statement should be inside braces [readability-braces-around-statements]
++ [[ 0 == 0 ]]
++ exit 1
--

Full log here.

@jackal1-66 jackal1-66 requested a review from a team as a code owner November 18, 2024 10:43
@alibuild alibuild mentioned this pull request Nov 18, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sawenzel sawenzel Awaiting requested review from sawenzel sawenzel is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jackal1-66 @alibuild